Merging 'diff-multi' and 'diff-multi-revs'.

diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php
index 412e8c0..bb2fe4c 100644 (file)
--- a/includes/DifferenceEngine.php
+++ b/includes/DifferenceEngine.php
@@ -450,8 +450,7 @@ CONTROL;
                if ( !$n )
                        return '';
 
-               $msg = wfMsgExt( 'diff-multi-revs', array( 'parseinline' ), $n );
-               return wfMsgExt( 'diff-multi', array('parseinline'), $msg );
+               return wfMsgExt( 'diff-multi', array( 'parseinline' ), $n );
        }
 
 

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index b97858e..baea6c7 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1091,8 +1091,7 @@ is placed by the site operators.",
 'selectolderversionfordiff' => 'Select an older version for comparison',
 'compareselectedversions' => 'Compare selected versions',
 'editundo'     => 'undo',
-'diff-multi'   => "($1 not shown.)",
-'diff-multi-revs' => "{{plural:$1|One intermediate revision|$1 intermediate revisions}}",
+'diff-multi'   => "({{plural:$1|One intermediate revision|$1 intermediate revisions}} not shown.)",
 
 # Search results
 #

diff --git a/languages/messages/MessagesFi.php b/languages/messages/MessagesFi.php
index 8f0f014..cf720d2 100644 (file)
--- a/languages/messages/MessagesFi.php
+++ b/languages/messages/MessagesFi.php
@@ -606,8 +606,7 @@ Syynä tähän on luultavasti jatkuva häiriköinti yhteiskäyttökoneelta.',
 'selectnewerversionfordiff' => 'Valitse uudempi versio vertailuun',
 'selectolderversionfordiff' => 'Valitse vanhempi versio vertailuun',
 'compareselectedversions'   => 'Vertaile valittuja versioita',
-'diff-multi'           => "(Versioiden välissä $1.)",
-'diff-multi-revs'      => "{{plural:$1|yksi muu muokkaus|$1 muuta muokkausta}}",
+'diff-multi'           => "(Versioiden välissä {{plural:$1|yksi muu muokkaus|$1 muuta muokkausta}}.)",
 
 # Search results
 #